Agent list page and links

jamesperet 10 years ago
parent
commit
eb29ad4dcb

+ 9 - 0
app/assets/stylesheets/avalanche_theme.css.less

@@ -247,6 +247,15 @@ h4 {
247 247
 	background: rgba(0, 0, 0, 0.2);
248 248
 }
249 249
 
250
+.btn-link {
251
+	border: none;
252
+}
253
+
254
+.btn-link:hover {
255
+	border: none;
256
+	background-color: transparent;
257
+}
258
+
250 259
 // Progress Bar
251 260
 
252 261
 .progress-success.progress-striped .bar, .progress-striped .bar-success {

+ 4 - 0
app/controllers/agents_controller.rb

@@ -2,5 +2,9 @@ class AgentsController < ApplicationController
2 2
 
3 3
   def dashboard
4 4
   end
5
+  
6
+  def list
7
+    @users = User.all
8
+  end
5 9
 
6 10
 end

+ 11 - 0
app/views/agents/list.html.erb

@@ -0,0 +1,11 @@
1
+<%= content_tag(:div, class: 'container top-container') do %>
2
+	<%= content_tag(:div, class: 'row') do %>
3
+		<%= content_tag(:div, class: 'span12') do %>
4
+			<% # Page Content %>
5
+			<%= bootstrap_flash %>
6
+			<%= content_tag(:div, class: 'page-header') do %>
7
+				<%= content_tag(:h1, (t 'agent.agents')) %>
8
+			<% end %>
9
+		<% end %>
10
+	<% end %>
11
+<% end %>

+ 13 - 5
app/views/layouts/_footer.html.erb

@@ -1,4 +1,8 @@
1
-<footer class="footer-black">
1
+<% if color == nil %>
2
+	<% color = 'black' %>
3
+<% end %>
4
+
5
+<footer class="footer-<%= color %>">
2 6
 	<div class="container">
3 7
 		<div class="row">
4 8
 			<div class="column first">
@@ -23,10 +27,14 @@
23 27
 			 </div>
24 28
 			 <div class="column">
25 29
 				 <div class="column-inner">
26
-  		 		    <a class="btn-about" href="#about"><%= (t "landing_page.about").html_safe %></a><br>
27
-  		 		    <a class="btn-features" href="#features"><%= (t "landing_page.features").html_safe %></a><br>
28
-  		 		    <a class="btn-subscribe" href="#subscribe"><%= (t "landing_page.subscribe").html_safe %></a><br>
29
-  		 		    <%= link_to (t "registration.sign_in"), new_user_session_path, class: "btn-login" %><br>
30
+  		 		    <%= link_to (t 'nav.home'), root_path  %><br>
31
+				    <%= link_to "Blog", blog_path  %><br>
32
+				    <%= link_to (t 'contact.contact'), contact_messages_path  %><br>
33
+				    <% if user_signed_in? %>
34
+				    	<%= link_to (t "registration.account"), edit_user_registration_path, class: "btn-account" %><br>
35
+				    <% else %>
36
+  		 		    	<%= link_to (t "registration.sign_in"), new_user_session_path, class: "btn-login" %><br>
37
+				    <% end %>
30 38
 			    </div>
31 39
 			 </div>
32 40
 			 <div class="column">

+ 1 - 2
app/views/layouts/_navigation_links.html.erb

@@ -4,8 +4,7 @@
4 4
     	  <li><%= link_to (t 'agent.dashboard'), dashboard_path %></li>
5 5
     <% end %>
6 6
     <li><%= link_to (t 'missions.missions'), missions_path %></li>
7
-    <li><%= link_to "Blog", blog_path  %></li>
8
-    <li><%= link_to (t 'contact.contact'), contact_messages_path  %></li>
7
+    <li><%= link_to (t 'agents.agents'), agent_list_path %></li>
9 8
   </ul>
10 9
   
11 10
 <ul class="nav pull-right">

+ 1 - 1
app/views/layouts/admin.html.erb

@@ -59,6 +59,6 @@
59 59
 	    <div class="push"></div>	
60 60
     </div>
61 61
     
62
-    <%= render 'layouts/footer' %>
62
+    <%= render partial: 'layouts/footer', locals: {color: 'black'} %>
63 63
   </body>
64 64
 </html>

+ 2 - 1
app/views/layouts/application.html.erb

@@ -59,7 +59,8 @@
59 59
 	    <div class="push"></div>	
60 60
     </div>
61 61
     
62
-    <%= render 'layouts/footer' %>
62
+    <% params[:controller] == 'start' ? color = 'white' : 'black' %>
63
+    <%= render partial: 'layouts/footer', locals: {color: color} %>
63 64
      
64 65
 
65 66
   </body>

+ 1 - 0
config/routes.rb

@@ -30,6 +30,7 @@ Avalanche2::Application.routes.draw do
30 30
   
31 31
   # Agents
32 32
   get 'dashboard', to: 'agents#dashboard', as: :dashboard
33
+  get 'agents', to: 'agents#list', as: :agent_list
33 34
 
34 35
   # Admin Panel
35 36
   get "admin/dashboard" => "admin_panel#dashboard", :as => :admin_dashboard